Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge UI Branch #1

Merged
merged 32 commits into from
Feb 25, 2013
Merged

Merge UI Branch #1

merged 32 commits into from
Feb 25, 2013

Conversation

haoyuan
Copy link
Contributor

@haoyuan haoyuan commented Feb 24, 2013

No description provided.

haoyuan and others added 30 commits February 8, 2013 18:40
@haoyuan
ui initial commit
3e568ec
@calvinjia
Initial UI modifications
580d2f6
@calvinjia
Experimenting with servlets
22343a5
@calvinjia
Embedded Jetty with servlets.
1db614e
@calvinjia
twitter bootstrap resources
6762a3a
@calvinjia
moved around some files
cf3e3a8
@calvinjia
Reverting to working model.
fd911ef
@calvinjia
Changed jetty version to 7.6.9, added jetty security and webapp libra…
fe30181 
…ries for UI, added mortbay jetty plugin for UI
@calvinjia
some filekeeping and the base for the browse.jsp page
40abb92
@calvinjia
Starting to populate fields
5f1e170
@haoyuan
Resolve the merge confict.
d9c154c
@calvinjia
Adding file system browsing servlet and page, updating general info page
e694987
@calvinjia
merge conflict
742e53c
@haoyuan
Fix the build and a big.
a221b12
@haoyuan
Merge branch 'master' into ui
335d524
@haoyuan
Merge branch 'master' into ui
22ba4fe
@calvinjia
populated some more fields
f93a5a5
@haoyuan
Merge branch 'master' into ui
14e937b
@calvinjia
removed mortbay plugin
abf3aef
@haoyuan
Format the code a bit.
dd50352
@calvinjia
Changed jetty version to 8.1.9, added JSTL libraries, completed basic…
4bf5263 
… UI features
@haoyuan
Merge branch 'master' into ui
1f9c507
@calvinjia
Changed mortbay library to the eclipse version and added glassfish, c…
2a1c9e1 
…ode styling changes
@calvinjia
Merge branch 'ui' of https://github.com/amplab/tachyon into ui
900a69d
@haoyuan
merge
829afd9
@calvinjia
Added debugging in UI, fixed bugs in browsing file system
35fc4fa
@haoyuan
tune.
83f0ad0
@haoyuan
Merge branch 'master' into ui
0aca698
@haoyuan
remove .class from .gitignore. remove unnecessary plugin from pom.xml
6c2f59f
@haoyuan
Clean UI branch for merging it back to the master branch.
101128c
@haoyuan haoyuan merged commit 17b2f0e into master Feb 25, 2013
haoyuan added a commit that referenced this pull request Dec 25, 2013
@haoyuan
Merge pull request #1 from haoyuan/variable
3a2c8d9 
Variable
haoyuan pushed a commit that referenced this pull request Jun 21, 2014
@CrazyJvm
Merge pull request #1 from amplab/master
91323ef 
merge
This was referenced Jul 13, 2014
Closed
Closed
gpang pushed a commit that referenced this pull request Nov 14, 2015
@cybermaster
Merge pull request #1 from amplab/master
97f9a3f 
[TACHYON-1294] mWorkerAddress in MasterWorkerInfo should be private
apc999 referenced this pull request in apc999/alluxio Feb 23, 2016
@jsimsa
Merge pull request #1 from TachyonNexus/package
1130f06 
[RENAME] renaming tachyon package to alluxio
yupeng9 pushed a commit that referenced this pull request Feb 24, 2016
@BrickXu
Merge pull request #1 from amplab/master
3a0a642 
Merge upstream
apc999 pushed a commit that referenced this pull request Mar 20, 2016
Merge pull request #1 from Alluxio/master
bc88532 
merge origin codes
ifcharming pushed a commit that referenced this pull request Jun 4, 2016
Merge pull request #1 from sheffieldge/new-branch
536b585 
Update Running-Hadoop-MapReduce-on-Alluxio.md
@mseaspring mseaspring mentioned this pull request Jul 26, 2016
Merged
aaudiber pushed a commit that referenced this pull request Oct 24, 2016
@Chinese-xingyi
Merge pull request #1 from Alluxio/master
012f318 
[ALLUXIO-2136] Mark class MetricsConfigTest as final
@aaudiber aaudiber mentioned this pull request Nov 4, 2016
Merged
apc999 pushed a commit that referenced this pull request Jan 19, 2017
@foreverunforget
[SMALLFIX]Merge pull request #1 from foreverunforget/param_partition
1ac0414 
162line partition
jsimsa pushed a commit that referenced this pull request Mar 22, 2017
@ShailShah
Merge pull request #1 from Alluxio/master
d313f67 
Update fork
@nika11 nika11 mentioned this pull request Jul 6, 2017
Merged
apc999 pushed a commit that referenced this pull request Aug 28, 2017
@xtang2
Merge pull request #1 from Alluxio/master
5c85366 
update
aaudiber pushed a commit that referenced this pull request Nov 14, 2017
@panyawen
Merge pull request #1 from panyawen/panyawen-patch-1
9b1d007 
[SMALLFIX]Supply the variable name to Precondition.checkNotNull
runsisi pushed a commit to runsisi/alluxio that referenced this pull request Nov 27, 2017
@panyawen
Merge pull request Alluxio#1 from panyawen/panyawen-patch-1
999425d 
[SMALLFIX]Supply the variable name to Precondition.checkNotNull
@aaudiber aaudiber mentioned this pull request Feb 22, 2018
Merged
@yupeng9 yupeng9 mentioned this pull request May 7, 2018
Merged
@liupan664021 liupan664021 mentioned this pull request Nov 13, 2020
Closed
apc999 pushed a commit that referenced this pull request Nov 26, 2020
@chaowangnk1
DynamicResourcePool: flat recursive calls in acquire (#1)
4e5fb3a
@shenghui361 shenghui361 mentioned this pull request Jun 23, 2021
Closed
@liugs0213 liugs0213 mentioned this pull request Sep 22, 2021
Closed
@lilyzhoupeijie lilyzhoupeijie mentioned this pull request Oct 22, 2021
Open
@Nizifan Nizifan mentioned this pull request Dec 22, 2021
Closed
@ssz1997 ssz1997 mentioned this pull request Apr 7, 2022
Merged
@cangyin cangyin mentioned this pull request Apr 25, 2022
Closed
twalluxio pushed a commit to twalluxio/alluxio that referenced this pull request Aug 10, 2023
@jiacheliu3
Merge pull request Alluxio#1 from voddle/fix-stress-worker-bench
69569db 
Allow using `--startMs` for long preparations
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@haoyuan @calvinjia